Merge tag 'upstream/2016.15' into debian/master
authorSimon McVittie <smcv@debian.org>
Tue, 13 Dec 2016 13:00:33 +0000 (13:00 +0000)
committerSimon McVittie <smcv@debian.org>
Tue, 13 Dec 2016 13:00:33 +0000 (13:00 +0000)
Upstream version 2016.15


Trivial merge